package liuwei.gitexample;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;

public class MainActivity extends AppCompatActivity {

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);
        Log.e("tag","分支master中的修改");
        Log.e("tag","当前是test分支的修改");
        Log.e("tag","合并时使用普通模式，而非默认的快速合并模式")  ;
        Log.e("tag","bug分支，使用stash指令")  ;
        Log.e("tag","当前位置多人修改，测试冲突");

    }

    private void fixBug(){
        Log.e("tag","推送到远程服务器")  ;
        Log.e("tag","debug分支");
    }
}
